initramfs: tolerate pre-existing /run/systemd/volatile-root symlink#2276
Merged
Johan-Liebert1 merged 1 commit intoJul 8, 2026
Merged
Conversation
ostree-prepare-root is growing the same gpt-auto workaround for composefs roots (creating the /run/systemd/volatile-root symlink so systemd's blockdev_get_root() can resolve the backing device, see systemd/systemd#35017), proposed in ostreedev/ostree#3608. It runs before bootc-root-setup.service, so once that lands the symlink already exists by the time gpt_workaround() runs, and the unconditional symlink() call makes the service fail. Both creators point the symlink at the /dev/block/MAJ:MIN alias of the same physical root device, so simply ignore EEXIST, matching how ensure_dir() handles already-existing directories. Signed-off-by: Ricardo Salveti <[email protected]>
cgwalters
approved these changes
Jul 6, 2026
cgwalters
left a comment
cgwalters
left a comment
Collaborator
There was a problem hiding this comment.
Thanks!
(That said, not related to your PR but I think what we really want to do is actually add the overlayfs API to query backing layers)
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
Contributor
Author
|
Doesn't look like the CI failures are related to this change. |
cgwalters
pushed a commit
to cgwalters/composefs-rs
that referenced
this pull request
Jul 9, 2026
ostree-prepare-root is growing the same gpt-auto workaround for composefs roots (creating the /run/systemd/volatile-root symlink so systemd's blockdev_get_root() can resolve the backing device, see systemd/systemd#35017), proposed in ostreedev/ostree#3608. When it runs before composefs-setup-root, the symlink already exists by the time gpt_workaround() runs and the unconditional symlink() call fails with EEXIST. The call site discards the error ("best effort"), but an already existing symlink means the desired end state is in place, so treat it as success rather than an error. This matches the equivalent change to bootc's vendored copy of this code in bootc-dev/bootc#2276. Signed-off-by: Ricardo Salveti <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
ostree-prepare-root is growing the same gpt-auto workaround for composefs roots (creating the /run/systemd/volatile-root symlink so systemd's blockdev_get_root() can resolve the backing device, see systemd/systemd#35017), proposed in ostreedev/ostree#3608. It runs before bootc-root-setup.service, so once that lands the symlink already exists by the time gpt_workaround() runs, and the unconditional symlink() call makes the service fail.
Both creators point the symlink at the /dev/block/MAJ:MIN alias of the same physical root device, so simply ignore EEXIST, matching how ensure_dir() handles already-existing directories.